Revert fbf8e80..c378ac6

This rolls back to commit fbf8e80933a0c704424a6c8986c80d8444e788b5.