Revert a2ca3f7..2018235

This rolls back to commit a2ca3f7e4544a702a8a46e736a0eecc3656b6389.