Revert fae8696..3c54122

This rolls back to commit fae8696c4fe242aee94e8cc64b0cb10e29dfc91f.