Revert 771ccae..39d174b

This rolls back to commit 771ccae894d51e45c0213c553751e42ac016c512.