Revert f948fb4..c257bdb

This rolls back to commit f948fb4435aba46f041adb36fcc1d7f4f9149370.