Revert 22c831c..c32f0bd

This rolls back to commit 22c831cb73f34ca5007d4197ef09107ff7e21169.
Recovering from stuffup. Need to redo calender day spliting