Revert 5f02804..2462335

This rolls back to commit 5f02804bbc8fdd793334b2e51b9ab8cdb1d0fe5f.