Revert cbbc39c..bac6ff4

This rolls back to commit cbbc39cc9fb64d1d1e0b0ede97204dc8c207d813.