Revert 25d6a1f..2fa9b5d

This rolls back to commit 25d6a1f20f163a121be42f35e8c7189e89948f8a.