Revert b98ad00..c405aaa

This rolls back to commit b98ad001993f1c6bb050d20c03e732664f4ef73c.
Added calculation delay to prevent data contention