Revert 743b2b3..e299fcf

This rolls back to commit 743b2b3e59c117aa4ce41df7a17803c917784689.