Revert 051b1a3..99b2c83

This rolls back to commit 051b1a387ac0b6df1b65d542b09652dee8cf0051.