Revert 1f055b2..90569c9

This rolls back to commit 1f055b253d72afbfbdac2a8274a83811ba49b4ed.