Revert de26095..f5057ee

This rolls back to commit de26095057a52dcc9144b25e1ff9d49bcbaf21d4.