Revert 45c67f6..d44575d

This rolls back to commit 45c67f68d311c5b397473e949bba2fb60af53fb6.
Post dates