Revert 8bd55db..04f208a

This rolls back to commit 8bd55db4eebd9314ab10dfcdd33645f4ca75ef3d.