reverting commits: e03eec1c83b648b9b6d1a985b505ebc68fa33b4b, 442c41eb4d931c190f0252eac9dd25dd0e94e80f, and 3cfc73ff3a6e6379c3b9f77df3b9f462f7509996
Merge branch 'deploy-fix' into attendance-views