Revert 35fcbbc..2f94206

This rolls back to commit 35fcbbcfcaf9ae2c3b33a16783d88bf610b3e056.