Revert 19d818d..2671569

This rolls back to commit 19d818de2ed76a19427cf2f6e561d7b8d8fc8765.