Revert 9cfa4ed..9ca5cb8

This rolls back to commit 9cfa4ed0c9681891593b9c5a1246f1028520fd8f.