Revert d87706e..eb92cff

This rolls back to commit d87706e60c177b55cf557d06525e53f595562aa2.