Revert 8a4a5be..a36c09e

This rolls back to commit 8a4a5bef8dc3d4c7ec46f4ffd1c8cfc7a4299310.