Revert ffc45c9..ebba183

This rolls back to commit ffc45c91494396d3a4a809efc96b4b391a0c2632.