Revert d0aa811..a0bc690

This rolls back to commit d0aa811846f8d539e21bc27ed9d9606b0ad154c6.