Revert 5e4bd9f..ec52367

This rolls back to commit 5e4bd9ff7d286a5a663ddf59051b6230da4ee8cc.