Did this just move here for code-style reasons?