Revert 4c113f0..3d64a3a

This rolls back to commit 4c113f0daa8b8596c22ecab0c2fb32de85146f84.