Revert 75c58ea..a00abad

This rolls back to commit 75c58ea8f015c6f4b29ff7970f8d52469c0c785b.