diff --git a/specification/application_service_api.rst b/specification/application_service_api.rst
index 51280341..5b7abf4a 100644
--- a/specification/application_service_api.rst
+++ b/specification/application_service_api.rst
@@ -289,26 +289,37 @@ An example request would be::
  GET /_matrix/client/%CLIENT_MAJOR_VERSION%/account/whoami?user_id=@_irc_user:example.org
  Authorization: Bearer YourApplicationServiceTokenHere
 
+.. TODO-TravisR: Temporarily take out timestamp massaging while we're releasing r0.
+   See https://github.com/matrix-org/matrix-doc/issues/1585
+.. Timestamp massaging
+   +++++++++++++++++++
+   The application service may want to inject events at a certain time (reflecting
+   the time on the network they are tracking e.g. irc, xmpp). Application services
+   need to be able to adjust the ``origin_server_ts`` value to do this.
+
+   Inputs:
+   - Application service token (``as_token``)
+   - Desired timestamp (in milliseconds since the unix epoch)
+
+   Notes:
+   - This will only apply when sending events.
+
+   ::
+
+    PUT /_matrix/client/r0/rooms/!somewhere:domain.com/send/m.room.message/txnId?ts=1534535223283
+    Authorization: Bearer YourApplicationServiceTokenHere
+
+    Content: The event to send, as per the Client-Server API.
 
 Timestamp massaging
 +++++++++++++++++++
-The application service may want to inject events at a certain time (reflecting
-the time on the network they are tracking e.g. irc, xmpp). Application services
-need to be able to adjust the ``origin_server_ts`` value to do this.
 
-Inputs:
- - Application service token (``as_token``)
- - Desired timestamp (in milliseconds since the unix epoch)
-
-Notes:
- - This will only apply when sending events.
-
-::
-
- PUT /_matrix/client/r0/rooms/!somewhere:domain.com/send/m.room.message/txnId?ts=1534535223283
-  Authorization: Bearer YourApplicationServiceTokenHere
-
- Content: The event to send, as per the Client-Server API.
+Previous drafts of the Application Service API permitted application services
+to alter the timestamp of their sent events by providing a ``ts`` query parameter
+when sending an event. This API has been excluded from the first release due to
+design concerns, however some servers may still support the feature. Please visit
+`issue #1585 <https://github.com/matrix-org/matrix-doc/issues/1585>`_ for more
+information.
 
 Server admin style permissions
 ++++++++++++++++++++++++++++++