Revert 399236f..9395c23

This rolls back to commit 399236f56a3378b740794dc1900549a60fef9b4a.