Revert 8661b07..cea312f

This rolls back to commit 8661b07d2835b26d12f3f9f1dcc64b6a6f17ce43.