Revert 1172c2b..a444b54

This rolls back to commit 1172c2bae21840b2a3d9933da7f515d46a3cc300.