Revert b369dd4..0cd30ef

This rolls back to commit b369dd406cb9848fa7170159d536997182c3c83b.