Revert 95cce3f..ef2fa8e

This rolls back to commit 95cce3fb6f1a51072f63e16351d7ad64c822c8cd.