Revert 30fac63..ff46b15

This rolls back to commit 30fac63562ee8463f72a60fb00ec2d90a585d9fa.