Revert 19adea4..cee5231

This rolls back to commit 19adea4b5a0b40530d812e48ed215649b497cc8a.