Revert 3dad1f5..0d3bb08

This rolls back to commit 3dad1f5fa14ab5129f206bec11859706b332f096.