Revert 6b67c7b..055b14a

This rolls back to commit 6b67c7b40f5fe16a584ca44215b1df83cea49413.