Revert bb96479..a823307

This rolls back to commit bb964795e91b517431d317c50b35e8081b35b271.