FC023 and FC017
Revert "FC023 and FC017"

This reverts commit 4f8acbd8cb50f17830fa33180369d962d76e4b84.