Revert "Revert "Try fixing the bar - will fail miserably""

This reverts commit e6177e891d04faecb9aa37c1b6e875ed300c51d9.