Revert 439393b..7673ebe

This rolls back to commit 439393b5bc1ce73a4b717e3306031d73c1d2c3d1.