Revert 8a48d99..d9b8f77

This rolls back to commit 8a48d99d27da4b11daf4f1072a273ed35d5fc1a4.