Revert 40d92e5..f8d94a7

This rolls back to commit 40d92e531a76275b4abfa55f63ab1f545a9cc11d.