Revert ed15102..6536aac

This rolls back to commit ed1510278b4f4b5df6f250e2625f4f28b193a461.