Revert a7cb304..1ca1eb9

This rolls back to commit a7cb304d59ddf9e00ca6525b9b863179605732ba.