Revert 99d7ab8..8d91394

This rolls back to commit 99d7ab89a6bcd4a89c8af2accadd0f40bf76d362.