Revert 8c2ddd4..5fc5fcc

This rolls back to commit 8c2ddd476a47932be16875bf0947104b222c13fe.