Reverting previous as build was unstable

This reverts commit 4332245217c5c88afd7a1a6f7783fba24107870f.