Revert 7a76e82..27d3bfe

This rolls back to commit 7a76e8254ed81d9c002e888daa8ab9ec05c36406.