Revert "Minutes, Not Seconds!"

This reverts commit 12fdd1b2646dfbe929d3c9057ec1d17e9d4daf36.
Revert "Match the current map proto in the main element."

This reverts commit 4988c5961c0a5668de6fa92a06f673cbd73c204f.