Revert 8eee206..8a6db34

This rolls back to commit 8eee206095d634483ecec3047c37de48830081b3.