Revert bd5b60b..bbac928

This rolls back to commit bd5b60bc4311dd4eaea184ac049fcd82626a0497.