Revert d4db974..811131b

This rolls back to commit d4db974cf18617463d413bbc3a29549501523eaf.