Revert d06b426..a427246

This rolls back to commit d06b4261f8a6356c570ecb0779b7745e64f8cdac.