Revert 1920bbf..2ca27d6

This rolls back to commit 1920bbfaee1a9534fda88ed7366d68e2ed93cf39.