Revert 6a7aa25..bb9910a

This rolls back to commit 6a7aa2513a7ed782c3af17fab84289edba3af4dc.