Revert 0a0a977..d35c0ab

This rolls back to commit 0a0a97781b4b88bde7543b8f69576951012d9789.