Revert 5c27734..5ae7af0

This rolls back to commit 5c27734568f52afdd7578468793bd60fb9a2a3a6.
CONTXT

PROJECT