Revert bbf48c7..c31a2bf

This rolls back to commit bbf48c7cfd0c1b47f3fbc39edf10dfc0efafe7cb.