Revert a46e895..de5e78d

This rolls back to commit a46e89528212a519b8e232e079bc460a938690a4.