Revert 9ae34b5..0e15fa3

This rolls back to commit 9ae34b5402b20061b5a44ccc58ea0f1baccc811e.