Revert a04d7d7..05903b7

This rolls back to commit a04d7d70df0f64cdeae54348de360d9d4edf3284.