Revert 6438038..f040249

This rolls back to commit 64380384c57a4c07d613cf08ff418a431757b240.