Revert 88eeccf..1841209

This rolls back to commit 88eeccff3096ac87dda5d03b80c74a885151bb7a.