Revert 1c525f1..2ac9a7c

This rolls back to commit 1c525f117f2e0a4d505cfc4a1bedef20af1bc85b.