Revert e26c04e..b518efd

This rolls back to commit e26c04e70fbcb58f564852d2e50d1b760dcc9ff2.