Revert 8ded18d..ea9d01e

This rolls back to commit 8ded18d84d7762772174a4f3642e46a01f14aaa9.