Revert 646a0b3..dcea241

This rolls back to commit 646a0b322a48238ff933eee7b0486a924f72e318.