Revert "Merge pull request #213 from Alfresco/1.5.0-Dev"

This reverts commit d9c14d88531ddd34ad60e6ae717b1386376c3d32, reversing
changes made to 583e300daf653280727cf7fe5f737f41d4858985.