reverted platform changes and moved to common config