Revert b6211da..7596723

This rolls back to commit b6211daa11fe87728a6ffcc43db6c0870bef9296.