Revert c080219..5fdf7ae

This rolls back to commit c0802192d3cd6a294fc1dbd82d3785c91cddb995.