Revert 9f120e0..5f65142

This rolls back to commit 9f120e0d2b3f4e91c7678bb33faf88fe934fe19b.
Revert "Revert 9f120e0..5f65142"

This reverts commit 9ad420a3c062019ac628c9fe03c573d57f816ce7.
Pre-codesign changes