Revert "Change where <standard /> and <seasonal /> are placed"

This reverts commit 3cc7b40907e5a5ff97b7d3765c6d2d456c333169.