Revert 99a5653..d6e604e

This rolls back to commit 99a5653d715a8c88e4bff748012b43c47a155913.