Revert 2a99a27..06ea789

This rolls back to commit 2a99a27b86be08c10a5181884e66789fb1924b4a.