Revert c9fef44..d136968

This rolls back to commit c9fef44a23bd3d1e2357962eaa9089595d781fae.