Revert 3675c7a..1645063

This rolls back to commit 3675c7a993becc7ece358fc2b0cb1ad7b89b2968.