Revert 1424951..fc11d2b

This rolls back to commit 14249510a9b93e3be15701a0eaa689cd1ea82fc4.