Revert a7092b7..ac11626

This rolls back to commit a7092b7fc6a72fe8a0a81ec7197c57d465dbfc84.