Revert 6bb71fd..560e3c0

This rolls back to commit 6bb71fdd8f7cc346d90fb14beb38b7297fc1ffd9.