Revert "#AP11 ; #AP45"

This reverts commit b2b56254283a806720073cb5c35dc6b86459c487.